Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorRobert Lipe <robertlipe@gpsbabel.org>
Tue, 19 Sep 2017 20:26:58 +0000 (15:26 -0500)
committerRobert Lipe <robertlipe@gpsbabel.org>
Tue, 19 Sep 2017 20:26:58 +0000 (15:26 -0500)

Trivial merge